Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / misc / volume16 / gnuplot2.02 / patch5 < prev next >

Wrap

Internet Message Format | 1991-01-05 | 49.3 KB

From: rjl@monu1.cc.monash.edu.au (Russell Lang) Newsgroups: comp.sources.misc Subject: v16i015: Gnuplot 2.0 patch 2, 5 of 7 Message-ID: <1991Jan5.040647.2591@sparky.IMD.Sterling.COM> Date: 5 Jan 91 04:06:47 GMT Approved: kent@sparky.imd.sterling.com X-Checksum-Snefru: ff16acb1 90033575 450272e5 f48d85df Submitted-by: Russell Lang <rjl@monu1.cc.monash.edu.au> Posting-number: Volume 16, Issue 15 Archive-name: gnuplot2.02/patch5 Patch-To: gnuplot2.0: Volume 11, Issue 65-79 #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of shell archive." # Contents: patch2d # Wrapped by eln272v@monu1 on Wed Dec 19 11:57:56 1990 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f patch2d -a "${1}" != "-c" ; then echo shar: Will not over-write existing file \"patch2d\" else echo shar: Extracting \"patch2d\" $47123 characters$ sed "s/^X//" >patch2d <<'END_OF_patch2d' Xdiff -cr ./makefile.x11 ../gnuplot2.02/makefile.x11 X*** ./makefile.x11 Tue Sep 18 14:56:55 1990 X--- ../gnuplot2.02/makefile.x11 Tue Dec 11 16:42:09 1990 X*************** X*** 1,5 X # X! # GNUPLOT Makefile (Unix X11 support) X # X X # directory where to install executables on 'make install' X X--- 1,5 ----- X # X! # GNUPLOT Makefile (Unix X11 Motif/Athena support) X # X X # directory where to install executables on 'make install' X*************** X*** 16,22 X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?) X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset() X # -DNOCOPY if you don't have a memcpy() by any name X! # -DGAMMA if you've got gamma(3) X # -fswitch if you are compiling on a Sun3 (or even -f68881) X # (but -fswitch is buggy on some systems, so watch out) X # -O if you trust your compiler's optimizer X X--- 16,27 ----- X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?) X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset() X # -DNOCOPY if you don't have a memcpy() by any name X! # -DGAMMA=gamma if you've got gamma(3) X! # -DNOCWDRC to inhibit check of ".gnuplot" in current directory X! # (for security reasons) X! # -DGETCWD if your unix uses getcwd() instead of getcd() X! # this is needed by HP-UX and Cray Unicos systems. X! # -Dunix is required to explicitly define "unix" for SCO X # -fswitch if you are compiling on a Sun3 (or even -f68881) X # (but -fswitch is buggy on some systems, so watch out) X # -O if you trust your compiler's optimizer X*************** X*** 20,27 X # -fswitch if you are compiling on a Sun3 (or even -f68881) X # (but -fswitch is buggy on some systems, so watch out) X # -O if you trust your compiler's optimizer X! # -Dunix and no -DVFORK if IBM RS/6000 AIX 3.1 X! CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O X X # -lplot if you have -DUNIXPLOT X # -lsuntool -lsunwindow -lpixrect if you have -DSUN X X--- 25,31 ----- X # -fswitch if you are compiling on a Sun3 (or even -f68881) X # (but -fswitch is buggy on some systems, so watch out) X # -O if you trust your compiler's optimizer X! CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA=gamma #-gx #-O X X # -lplot if you have -DUNIXPLOT X # -lsuntool -lsunwindow -lpixrect if you have -DSUN X*************** X*** 26,31 X # -lplot if you have -DUNIXPLOT X # -lsuntool -lsunwindow -lpixrect if you have -DSUN X # -lgl_s if IRIS4D X LIBS = -lm -lplot X X # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 X X--- 30,36 ----- X # -lplot if you have -DUNIXPLOT X # -lsuntool -lsunwindow -lpixrect if you have -DSUN X # -lgl_s if IRIS4D X+ # -lccgi if -DCGI X LIBS = -lm -lplot X X # -DMOTIF if Motif rather then Athena X*************** X*** 28,33 X # -lgl_s if IRIS4D X LIBS = -lm -lplot X X # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 X # Apollo DomainOS 10.4.2 (R3): -L/usr/lib/X11 -lXaw -lXmu -lXt -lX11 X # IBM RS/6000 AIX 3.1 (R3): -L/usr/lpp/X11/Xamples/lib/Xmu \ X X--- 33,41 ----- X # -lccgi if -DCGI X LIBS = -lm -lplot X X+ # -DMOTIF if Motif rather then Athena X+ X11FLAGS = #-DMOTIF X+ X # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 X # Apollo DomainOS 10.3 (R3/Athena): -L/usr/lib/X11 -lXaw -lXmu -lXt -lX11 X # Apollo DomainOS 10.3 (R3/Motif): -L/usr/lib/X11 -lXm -lXtm -lX11 X*************** X*** 29,36 X LIBS = -lm -lplot X X # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 X! # Apollo DomainOS 10.4.2 (R3): -L/usr/lib/X11 -lXaw -lXmu -lXt -lX11 X! # IBM RS/6000 AIX 3.1 (R3): -L/usr/lpp/X11/Xamples/lib/Xmu \ X # -L/usr/lpp/X11/Xamples/lib/Xaw \ X # -lXaw -lXmu -lXt -lXext -lX11 X X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 X X--- 37,45 ----- X X11FLAGS = #-DMOTIF X X # standard MIT X11 R4: -lXaw -lXmu -lXt -lXext -lX11 X! # Apollo DomainOS 10.3 (R3/Athena): -L/usr/lib/X11 -lXaw -lXmu -lXt -lX11 X! # Apollo DomainOS 10.3 (R3/Motif): -L/usr/lib/X11 -lXm -lXtm -lX11 X! # IBM RS/6000 AIX 3.1 (R3/Athena): -L/usr/lpp/X11/Xamples/lib/Xmu \ X # -L/usr/lpp/X11/Xamples/lib/Xaw \ X # -lXaw -lXmu -lXt -lXext -lX11 X # IBM RS/6000 AIX 3.1 (R3/Motif): -lXm -lXt -lX11 X*************** X*** 33,38 X # IBM RS/6000 AIX 3.1 (R3): -L/usr/lpp/X11/Xamples/lib/Xmu \ X # -L/usr/lpp/X11/Xamples/lib/Xaw \ X # -lXaw -lXmu -lXt -lXext -lX11 X X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 X X # standard MIT X11 R4: -I/usr/include/X11 -I/usr/include/X11/Xaw X X--- 42,49 ----- X # IBM RS/6000 AIX 3.1 (R3/Athena): -L/usr/lpp/X11/Xamples/lib/Xmu \ X # -L/usr/lpp/X11/Xamples/lib/Xaw \ X # -lXaw -lXmu -lXt -lXext -lX11 X+ # IBM RS/6000 AIX 3.1 (R3/Motif): -lXm -lXt -lX11 X+ # HP 9000/375 HP-UX 6.5 and 7.0 (R3/Motif): -lXm -lXt -lX11 X X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 X X # standard MIT X11 R4: -I/usr/include/X11 -I/usr/include/X11/Xaw X*************** X*** 36,44 X X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 X X # standard MIT X11 R4: -I/usr/include/X11 -I/usr/include/X11/Xaw X! # Apollo DomainOS 10.4.2 (R3): -I/usr/include/X11 X! # IBM RS/6000 AIX 3.1 (R3): -I/usr/include/X11 -I/usr/lpp/X11/Xamples/lib/Xaw \ X! # -I/usr/lpp/X11/Xamples/lib/Xaw/X11 X X11INCLUDES = -I/usr/include/X11 -I/usr/include/X11/Xaw X X # -D<terminal> in TERMFLAGS iff you wish to support <terminal> X X--- 47,59 ----- X X11LIBS = -lXaw -lXmu -lXt -lXext -lX11 X X # standard MIT X11 R4: -I/usr/include/X11 -I/usr/include/X11/Xaw X! # Apollo DomainOS 10.3 (R3/Athena): -I/usr/include/X11 X! # Apollo DomainOS 10.3 (R3/Motif): -I/usr/include/Xm X! # IBM RS/6000 AIX 3.1 (R3/Athena): -I/usr/include/X11 \ X! # -I/usr/lpp/X11/Xamples/lib/Xaw \ X! # -I/usr/lpp/X11/Xamples/lib/Xaw/X11 X! # IBM RS/6000 AIX 3.1 (R3/Motif): -I/usr/include/Xm X! # HP 9000/375 HP-UX 6.5 and 7.0 (R3/Motif): -I/usr/include/Xm X X11INCLUDES = -I/usr/include/X11 -I/usr/include/X11/Xaw X X # -D<terminal> in TERMFLAGS iff you wish to support <terminal> X*************** X*** 43,48 X X # -D<terminal> in TERMFLAGS iff you wish to support <terminal> X # see other terminal defines in term.h X # -DFIG Fig graphics language (requires object.h from TransFig) X # -DIRIS4D IRIS4D series computer X # -DSUN Sun Microsystems Workstation X X--- 58,64 ----- X X # -D<terminal> in TERMFLAGS iff you wish to support <terminal> X # see other terminal defines in term.h X+ # -DCGI SCO CGI X # -DFIG Fig graphics language (requires object.h from TransFig) X # -DIRIS4D IRIS4D series computer X # -DSUN Sun Microsystems Workstation X*************** X*** 51,57 X X TERMFLAGS = -Iterm -DUNIXPLOT -DX11 X X! OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\ X plot.o scanner.o setshow.o standard.o term.o util.o X X DIRS = term demo bugtest docs docs/latextut translate X X--- 67,73 ----- X X TERMFLAGS = -Iterm -DUNIXPLOT -DX11 X X! OBJS = bitmap.o command.o eval.o graphics.o help.o internal.o misc.o parse.o\ X plot.o scanner.o setshow.o standard.o term.o util.o X X DIRS = term demo bugtest docs docs/latextut translate X*************** X*** 58,71 X CSOURCE1 = command.c setshow.c X CSOURCE2 = help.c graphics.c internal.c X CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c X! CSOURCE4 = term.c util.c version.c X! CSOURCE5 = term/aed.trm term/dxy.trm term/epson.trm term/font5x7.trm \ X! term/hp26.trm term/hp2648.trm term/hpgl.trm \ X! term/hpljet.trm term/iris4d.trm term/sun.trm X! CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \ X! term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm X! CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \ X! term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c X # not C code, but still needed X ETC = Copyright README README.gnutex makefile.unx makefile.vms \ X README.x11 makefile.x11 \ X X--- 74,88 ----- X CSOURCE1 = command.c setshow.c X CSOURCE2 = help.c graphics.c internal.c X CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c X! CSOURCE4 = bitmap.c term.c util.c version.c X! CSOURCE5 = term/aed.trm term/cgi.trm term/dxy.trm term/eepic.trm \ X! term/epson.trm term/fig.trm term/hp26.trm term/hp2648.trm \ X! term/hpgl.trm term/hpljii.trm X! CSOURCE6 = term/imPcodes.h term/imagen.trm term/object.h \ X! term/iris4d.trm term/kyo.trm term/latex.trm term/pc.trm X! CSOURCE7 = term/post.trm term/qms.trm term/regis.trm term/sun.trm \ X! term/t410x.trm term/tek.trm term/unixpc.trm term/unixplot.trm \ X! term/v384.trm term/x11.trm gnuplot_x11.c X # not C code, but still needed X ETC = Copyright README README.gnutex makefile.unx makefile.vms \ X README.x11 makefile.x11 \ X*************** X*** 69,75 X # not C code, but still needed X ETC = Copyright README README.gnutex makefile.unx makefile.vms \ X README.x11 makefile.x11 \ X! makefile.3b1 plot.h help.h setshow.h term.h lasergnu \ X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ X demo/simple.demo demo/polar.demo demo/electron.demo \ X bugtest/README bugtest/printf.c bugtest/scanf.c \ X X--- 86,92 ----- X # not C code, but still needed X ETC = Copyright README README.gnutex makefile.unx makefile.vms \ X README.x11 makefile.x11 \ X! makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \ X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ X demo/simple.demo demo/polar.demo demo/electron.demo \ X demo/param.demo demo/using.demo demo/using.dat \ X*************** X*** 72,77 X makefile.3b1 plot.h help.h setshow.h term.h lasergnu \ X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ X demo/simple.demo demo/polar.demo demo/electron.demo \ X bugtest/README bugtest/printf.c bugtest/scanf.c \ X bugtest/mscbug.c term/README \ X linkopt.vms buildvms.com X X--- 89,95 ----- X makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \ X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \ X demo/simple.demo demo/polar.demo demo/electron.demo \ X+ demo/param.demo demo/using.demo demo/using.dat \ X bugtest/README bugtest/printf.c bugtest/scanf.c \ X bugtest/mscbug.c term/README \ X linkopt.vms buildvms.com X*************** X*** 82,88 X DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \ X docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \ X docs/gnuplot.1 docs/lasergnu.1 \ X! docs/titlepage.ms docs/titlepage.tex X DOCS2 = docs/gnuplot.doc X DOCS3 = docs/latextut/Makefile docs/latextut/eg1.plt \ X docs/latextut/eg2.plt docs/latextut/eg3.dat docs/latextut/eg3.plt \ X X--- 100,106 ----- X DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \ X docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \ X docs/gnuplot.1 docs/lasergnu.1 \ X! docs/titlepage.ms docs/titlepage.tex X DOCS2 = docs/gnuplot.doc X DOCS3 = docs/latextut/Makefile docs/latextut/eg1.plt \ X docs/latextut/eg2.plt docs/latextut/eg3.dat docs/latextut/eg3.plt \ X*************** X*** 108,114 X (cd translate; make) X X gnuplot_x11: gnuplot_x11.c X! $(CC) $(CFLAGS) $(X11INCLUDES) -o gnuplot_x11 gnuplot_x11.c $(X11LIBS) X X install: gnuplot gnuplot_x11 doc man_install X cp gnuplot gnuplot_x11 lasergnu $(DEST) X X--- 126,132 ----- X (cd translate; make) X X gnuplot_x11: gnuplot_x11.c X! $(CC) $(CFLAGS) $(X11FLAGS) $(X11INCLUDES) -o gnuplot_x11 gnuplot_x11.c $(X11LIBS) X X install: gnuplot gnuplot_x11 doc man_install X cp gnuplot gnuplot_x11 lasergnu $(DEST) X*************** X*** 116,124 X strip $(DEST)/gnuplot_x11 X (cd docs; make install-unix HELPDEST=$(HELPDEST)) X X! man_install: docs/gnuplot.1.x11 docs/lasergnu.1 X! cp docs/lasergnu.1 $(MANDEST) X! cp docs/gnuplot.1.x11 $(MANDEST)/gnuplot.1 X X plot.o: plot.c X $(CC) $(CFLAGS) -DX11 -c plot.c X X--- 134,141 ----- X strip $(DEST)/gnuplot_x11 X (cd docs; make install-unix HELPDEST=$(HELPDEST)) X X! man_install: docs/gnuplot.1 docs/lasergnu.1 X! cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST) X X plot.o: plot.c X $(CC) $(CFLAGS) -DX11 -c plot.c X*************** X*** 123,129 X plot.o: plot.c X $(CC) $(CFLAGS) -DX11 -c plot.c X X! term.o: term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c X X version.o: X X--- 140,146 ----- X plot.o: plot.c X $(CC) $(CFLAGS) -DX11 -c plot.c X X! term.o: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c X X version.o: X*************** X*** 136,142 X X command.o help.o misc.o: help.h X X! command.o graphics.o misc.o plot.o setshow.o: setshow.h X X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X X--- 153,159 ----- X X command.o help.o misc.o: help.h X X! command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h X X bitmap.o term.o: bitmap.h X X*************** X*** 138,145 X X command.o graphics.o misc.o plot.o setshow.o: setshow.h X X! SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ X! $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X X lint: X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) X X--- 155,161 ----- X X command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h X X! bitmap.o term.o: bitmap.h X X SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \ X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X*************** X*** 141,146 X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \ X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X X lint: X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) X X X--- 157,165 ----- X X bitmap.o term.o: bitmap.h X X+ SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \ X+ $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X+ X lint: X lint -hx $(SOURCES) X X*************** X*** 142,148 X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X X lint: X! lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4) X X clean: X rm -f *.o *~ term/*~ X X--- 161,167 ----- X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7) X X lint: X! lint -hx $(SOURCES) X X clean: X rm -f *.o *~ term/*~ Xdiff -cr ./misc.c ../gnuplot2.02/misc.c X*** ./misc.c Tue Sep 18 14:56:57 1990 X--- ../gnuplot2.02/misc.c Tue Dec 4 09:23:40 1990 X*************** X*** 36,41 X #include <graphics.h> X #endif X X extern char *malloc(); X X extern int c_token; X X--- 36,42 ----- X #include <graphics.h> X #endif X X+ #ifndef _IBMR2 X extern char *malloc(); X #endif X X*************** X*** 37,42 X #endif X X extern char *malloc(); X X extern int c_token; X extern char replot_line[]; X X--- 38,44 ----- X X #ifndef _IBMR2 X extern char *malloc(); X+ #endif X X extern int c_token; X extern char replot_line[]; X*************** X*** 224,229 X log_x ? 'x' : ' ', log_y ? 'y' : ' '); X fprintf(fp,"set offsets %g, %g, %g, %g\n",loff,roff,toff,boff); X fprintf(fp,"set %spolar\n", (polar)? "" : "no"); X fprintf(fp,"set samples %d\n",samples); X fprintf(fp,"set size %g,%g\n",xsize,ysize); X fprintf(fp,"set data style "); X X--- 226,232 ----- X log_x ? 'x' : ' ', log_y ? 'y' : ' '); X fprintf(fp,"set offsets %g, %g, %g, %g\n",loff,roff,toff,boff); X fprintf(fp,"set %spolar\n", (polar)? "" : "no"); X+ fprintf(fp,"set %sparametric\n", (parametric)? "" : "no"); X fprintf(fp,"set samples %d\n",samples); X fprintf(fp,"set size %g,%g\n",xsize,ysize); X fprintf(fp,"set data style "); X*************** X*** 246,251 X save_tics(fp, xtics, 'x', &xticdef); X save_tics(fp, ytics, 'y', &yticdef); X fprintf(fp,"set title \"%s\"\n",title); X fprintf(fp,"set xlabel \"%s\"\n",xlabel); X fprintf(fp,"set xrange [%g : %g]\n",xmin,xmax); X fprintf(fp,"set ylabel \"%s\"\n",ylabel); X X--- 249,255 ----- X save_tics(fp, xtics, 'x', &xticdef); X save_tics(fp, ytics, 'y', &yticdef); X fprintf(fp,"set title \"%s\"\n",title); X+ fprintf(fp,"set trange [%g : %g]\n",tmin,tmax); X fprintf(fp,"set xlabel \"%s\"\n",xlabel); X fprintf(fp,"set xrange [%g : %g]\n",xmin,xmax); X fprintf(fp,"set ylabel \"%s\"\n",ylabel); X*************** X*** 250,255 X fprintf(fp,"set xrange [%g : %g]\n",xmin,xmax); X fprintf(fp,"set ylabel \"%s\"\n",ylabel); X fprintf(fp,"set yrange [%g : %g]\n",ymin,ymax); X fprintf(fp,"set %s %c%c\n", X (autoscale_y||autoscale_x) ? "autoscale" : "noautoscale", X autoscale_x ? 'x' : ' ', autoscale_y ? 'y' : ' '); X X--- 254,261 ----- X fprintf(fp,"set xrange [%g : %g]\n",xmin,xmax); X fprintf(fp,"set ylabel \"%s\"\n",ylabel); X fprintf(fp,"set yrange [%g : %g]\n",ymin,ymax); X+ fprintf(fp,"set %s %c\n", X+ autoscale_t ? "autoscale" : "noautoscale", 't'); X fprintf(fp,"set %s %c%c\n", X (autoscale_y||autoscale_x) ? "autoscale" : "noautoscale", X autoscale_x ? 'x' : ' ', autoscale_y ? 'y' : ' '); X*************** X*** 341,347 X X if (input_line[len] == '\\') { /* line continuation */ X start = len; X! left -= len; X } else X more = FALSE; X } X X--- 347,353 ----- X X if (input_line[len] == '\\') { /* line continuation */ X start = len; X! left = MAX_LINE_LEN - start; /* left -=len;*/ X } else X more = FALSE; X } Xdiff -cr ./plot.c ../gnuplot2.02/plot.c X*** ./plot.c Tue Sep 18 14:57:01 1990 X--- ../gnuplot2.02/plot.c Mon Nov 26 09:17:19 1990 X*************** X*** 167,176 X /* Register the Borland Graphics Interface drivers. If they have been */ X /* included by the linker. */ X #ifdef __TURBOC__ X! registerbgidriver(CGA_driver); X! registerbgidriver(EGAVGA_driver); X! registerbgidriver(Herc_driver); X! registerbgidriver(ATT_driver); X #endif X #ifdef X11 X { int n = X11_args(argc, argv); argv += n; argc -= n; } X X--- 167,176 ----- X /* Register the Borland Graphics Interface drivers. If they have been */ X /* included by the linker. */ X #ifdef __TURBOC__ X! registerfarbgidriver(CGA_driver_far); X! registerfarbgidriver(EGAVGA_driver_far); X! registerfarbgidriver(Herc_driver_far); X! registerfarbgidriver(ATT_driver_far); X #endif X #ifdef X11 X { int n = X11_args(argc, argv); argv += n; argc -= n; } X*************** X*** 209,215 X /* after catching interrupt */ X /* VAX stuffs up stdout on SIGINT while writing to stdout, X so reopen stdout. */ X! if (outfile = stdout) { X if ( (stdout = freopen("SYS$OUTPUT","w",stdout)) == NULL) { X /* couldn't reopen it so try opening it instead */ X if ( (stdout = fopen("SYS$OUTPUT","w")) == NULL) { X X--- 209,215 ----- X /* after catching interrupt */ X /* VAX stuffs up stdout on SIGINT while writing to stdout, X so reopen stdout. */ X! if (outfile == stdout) { X if ( (stdout = freopen("SYS$OUTPUT","w",stdout)) == NULL) { X /* couldn't reopen it so try opening it instead */ X if ( (stdout = fopen("SYS$OUTPUT","w")) == NULL) { X*************** X*** 270,275 X #else X (void) strcat(strcpy(home,getenv(HOME)),"/"); X #endif /* vms */ X (void) strcpy(rcfile, PLOTRC); X plotrc = fopen(rcfile,"r"); X if (plotrc == (FILE *)NULL) { X X--- 270,279 ----- X #else X (void) strcat(strcpy(home,getenv(HOME)),"/"); X #endif /* vms */ X+ #ifdef NOCWDRC X+ /* inhibit check of init file in current directory for security reasons */ X+ { X+ #else X (void) strcpy(rcfile, PLOTRC); X plotrc = fopen(rcfile,"r"); X if (plotrc == (FILE *)NULL) { X*************** X*** 273,278 X (void) strcpy(rcfile, PLOTRC); X plotrc = fopen(rcfile,"r"); X if (plotrc == (FILE *)NULL) { X (void) sprintf(rcfile, "%s%s", home, PLOTRC); X plotrc = fopen(rcfile,"r"); X } X X--- 277,283 ----- X (void) strcpy(rcfile, PLOTRC); X plotrc = fopen(rcfile,"r"); X if (plotrc == (FILE *)NULL) { X+ #endif X (void) sprintf(rcfile, "%s%s", home, PLOTRC); X plotrc = fopen(rcfile,"r"); X } Xdiff -cr ./setshow.c ../gnuplot2.02/setshow.c X*** ./setshow.c Thu Aug 30 16:16:47 1990 X--- ../gnuplot2.02/setshow.c Tue Dec 4 12:09:45 1990 X*************** X*** 39,44 X * global variables to hold status of 'set' options X * X */ X BOOLEAN autoscale_x = TRUE; X BOOLEAN autoscale_y = TRUE; X BOOLEAN autoscale_lx = TRUE; X X--- 39,45 ----- X * global variables to hold status of 'set' options X * X */ X+ BOOLEAN autoscale_t = TRUE; X BOOLEAN autoscale_x = TRUE; X BOOLEAN autoscale_y = TRUE; X BOOLEAN autoscale_lt = TRUE; X*************** X*** 41,46 X */ X BOOLEAN autoscale_x = TRUE; X BOOLEAN autoscale_y = TRUE; X BOOLEAN autoscale_lx = TRUE; X BOOLEAN autoscale_ly = TRUE; X BOOLEAN clip_points = FALSE; X X--- 42,48 ----- X BOOLEAN autoscale_t = TRUE; X BOOLEAN autoscale_x = TRUE; X BOOLEAN autoscale_y = TRUE; X+ BOOLEAN autoscale_lt = TRUE; X BOOLEAN autoscale_lx = TRUE; X BOOLEAN autoscale_ly = TRUE; X BOOLEAN clip_points = FALSE; X*************** X*** 59,64 X FILE* outfile; X char outstr[MAX_ID_LEN+1] = "STDOUT"; X BOOLEAN polar = FALSE; X int samples = SAMPLES; X float xsize = 1.0; /* scale factor for size */ X float ysize = 1.0; /* scale factor for size */ X X--- 61,67 ----- X FILE* outfile; X char outstr[MAX_ID_LEN+1] = "STDOUT"; X BOOLEAN polar = FALSE; X+ BOOLEAN parametric = FALSE; X int samples = SAMPLES; X float xsize = 1.0; /* scale factor for size */ X float ysize = 1.0; /* scale factor for size */ X*************** X*** 66,72 X char title[MAX_LINE_LEN+1] = ""; X char xlabel[MAX_LINE_LEN+1] = ""; X char ylabel[MAX_LINE_LEN+1] = ""; X! double xmin = -10.0, X xmax = 10.0, X ymin = -10.0, X ymax = 10.0; X X--- 69,77 ----- X char title[MAX_LINE_LEN+1] = ""; X char xlabel[MAX_LINE_LEN+1] = ""; X char ylabel[MAX_LINE_LEN+1] = ""; X! double tmin = -5.0, X! tmax = 5.0, X! xmin = -10.0, X xmax = 10.0, X ymin = -10.0, X ymax = 10.0; X*************** X*** 76,81 X boff = 0.0; X double zero = ZERO; /* zero threshold, not 0! */ X X BOOLEAN xtics = TRUE; X BOOLEAN ytics = TRUE; X X X--- 81,89 ----- X boff = 0.0; X double zero = ZERO; /* zero threshold, not 0! */ X X+ BOOLEAN xzeroaxis = TRUE; X+ BOOLEAN yzeroaxis = TRUE; X+ X BOOLEAN xtics = TRUE; X BOOLEAN ytics = TRUE; X X*************** X*** 90,95 X /*** other things we need *****/ X extern char *strcpy(),*strcat(); X extern int strlen(); X X /* input data, parsing variables */ X extern struct lexical_unit token[]; X X--- 98,104 ----- X /*** other things we need *****/ X extern char *strcpy(),*strcat(); X extern int strlen(); X+ extern FILE *popen(); X X /* input data, parsing variables */ X extern struct lexical_unit token[]; X*************** X*** 116,121 X static void show_style(), show_range(), show_zero(); X static void show_offsets(), show_output(), show_samples(), show_size(); X static void show_title(), show_xlabel(), show_ylabel(); X static void show_label(), show_arrow(), show_grid(), show_key(); X static void show_polar(), show_tics(), show_ticdef(); X static void show_term(), show_plot(), show_autoscale(), show_clip(); X X--- 125,131 ----- X static void show_style(), show_range(), show_zero(); X static void show_offsets(), show_output(), show_samples(), show_size(); X static void show_title(), show_xlabel(), show_ylabel(); X+ static void show_xzeroaxis(), show_yzeroaxis(); X static void show_label(), show_arrow(), show_grid(), show_key(); X static void show_polar(), show_parametric(), show_tics(), show_ticdef(); X static void show_term(), show_plot(), show_autoscale(), show_clip(); X*************** X*** 117,123 X static void show_offsets(), show_output(), show_samples(), show_size(); X static void show_title(), show_xlabel(), show_ylabel(); X static void show_label(), show_arrow(), show_grid(), show_key(); X! static void show_polar(), show_tics(), show_ticdef(); X static void show_term(), show_plot(), show_autoscale(), show_clip(); X static void show_format(), show_logscale(), show_variables(); X X X--- 127,133 ----- X static void show_title(), show_xlabel(), show_ylabel(); X static void show_xzeroaxis(), show_yzeroaxis(); X static void show_label(), show_arrow(), show_grid(), show_key(); X! static void show_polar(), show_parametric(), show_tics(), show_ticdef(); X static void show_term(), show_plot(), show_autoscale(), show_clip(); X static void show_format(), show_logscale(), show_variables(); X X*************** X*** 131,136 X set_command() X { X static char testfile[MAX_LINE_LEN+1]; X X c_token++; X X X--- 141,149 ----- X set_command() X { X static char testfile[MAX_LINE_LEN+1]; X+ #ifdef unix X+ static BOOLEAN pipe_open = FALSE; X+ #endif X X c_token++; X X*************** X*** 145,151 X else if (almost_equals(c_token,"au$toscale")) { X c_token++; X if (END_OF_COMMAND) { X! autoscale_x = autoscale_y = TRUE; X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = TRUE; X c_token++; X X--- 158,164 ----- X else if (almost_equals(c_token,"au$toscale")) { X c_token++; X if (END_OF_COMMAND) { X! autoscale_t = autoscale_x = autoscale_y = TRUE; X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = TRUE; X c_token++; X*************** X*** 149,154 X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = TRUE; X c_token++; X } else if (equals(c_token, "x")) { X autoscale_x = TRUE; X c_token++; X X--- 162,170 ----- X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = TRUE; X c_token++; X+ } else if (equals(c_token, "t")) { X+ autoscale_t = TRUE; X+ c_token++; X } else if (equals(c_token, "x")) { X autoscale_x = TRUE; X c_token++; X*************** X*** 160,165 X else if (almost_equals(c_token,"noau$toscale")) { X c_token++; X if (END_OF_COMMAND) { X autoscale_x = autoscale_y = FALSE; X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = FALSE; X X--- 176,183 ----- X else if (almost_equals(c_token,"noau$toscale")) { X c_token++; X if (END_OF_COMMAND) { X+ autoscale_t = autoscale_x = autoscale_y = FALSE; X+ } else if (equals(c_token, "xy") || equals(c_token, "tyx")) { X autoscale_x = autoscale_y = FALSE; X c_token++; X } else if (equals(c_token, "t")) { X*************** X*** 161,168 X c_token++; X if (END_OF_COMMAND) { X autoscale_x = autoscale_y = FALSE; X- } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X- autoscale_x = autoscale_y = FALSE; X c_token++; X } else if (equals(c_token, "x")) { X autoscale_x = FALSE; X X--- 179,184 ----- X autoscale_t = autoscale_x = autoscale_y = FALSE; X } else if (equals(c_token, "xy") || equals(c_token, "tyx")) { X autoscale_x = autoscale_y = FALSE; X c_token++; X } else if (equals(c_token, "t")) { X autoscale_t = FALSE; X*************** X*** 164,169 X } else if (equals(c_token, "xy") || equals(c_token, "yx")) { X autoscale_x = autoscale_y = FALSE; X c_token++; X } else if (equals(c_token, "x")) { X autoscale_x = FALSE; X c_token++; X X--- 180,188 ----- X } else if (equals(c_token, "xy") || equals(c_token, "tyx")) { X autoscale_x = autoscale_y = FALSE; X c_token++; X+ } else if (equals(c_token, "t")) { X+ autoscale_t = FALSE; X+ c_token++; X } else if (equals(c_token, "x")) { X autoscale_x = FALSE; X c_token++; X*************** X*** 212,218 X } X else if (almost_equals(c_token,"d$ummy")) { X c_token++; X! copy_str(dummy_var,c_token++); X } X else if (almost_equals(c_token,"fo$rmat")) { X BOOLEAN setx, sety; X X--- 231,240 ----- X } X else if (almost_equals(c_token,"d$ummy")) { X c_token++; X! if (END_OF_COMMAND) X! int_error("expecting dummy variable name", c_token); X! else X! copy_str(dummy_var,c_token++); X } X else if (almost_equals(c_token,"fo$rmat")) { X BOOLEAN setx, sety; X*************** X*** 312,319 X (*term_tbl[term].reset)(); X if (END_OF_COMMAND) { /* no file specified */ X UP_redirect (4); X! if (outfile != stdout) /* Never close stdout */ X! (void) fclose(outfile); X outfile = stdout; /* Don't dup... */ X term_init = FALSE; X (void) strcpy(outstr,"STDOUT"); X X--- 334,348 ----- X (*term_tbl[term].reset)(); X if (END_OF_COMMAND) { /* no file specified */ X UP_redirect (4); X! if (outfile != stdout) { /* Never close stdout */ X! #ifdef unix X! if ( pipe_open ) { X! (void) pclose(outfile); X! pipe_open = FALSE; X! } else X! #endif X! (void) fclose(outfile); X! } X outfile = stdout; /* Don't dup... */ X term_init = FALSE; X (void) strcpy(outstr,"STDOUT"); X*************** X*** 321,329 X int_error("expecting filename",c_token); X else { X quote_str(testfile,c_token); X! if ((f = fopen(testfile,"w")) == (FILE *)NULL) { X! os_error("cannot open file; output not changed",c_token); X! } X if (outfile != stdout) /* Never close stdout */ X (void) fclose(outfile); X outfile = f; X X--- 350,365 ----- X int_error("expecting filename",c_token); X else { X quote_str(testfile,c_token); X! #ifdef unix X! if ( *testfile == '|' ) { X! if ((f = popen(testfile+1,"w")) == (FILE *)NULL) X! os_error("cannot create pipe; output not changed",c_token); X! else X! pipe_open = TRUE; X! } else X! #endif X! if ((f = fopen(testfile,"w")) == (FILE *)NULL) X! os_error("cannot open file; output not changed",c_token); X if (outfile != stdout) /* Never close stdout */ X (void) fclose(outfile); X outfile = f; X*************** X*** 361,366 X c_token++; X } X } X else if (almost_equals(c_token,"pol$ar")) { X if (!polar) { X polar = TRUE; X X--- 397,444 ----- X c_token++; X } X } X+ else if (almost_equals(c_token,"xzero$axis")) { X+ c_token++; X+ xzeroaxis = TRUE; X+ } X+ else if (almost_equals(c_token,"yzero$axis")) { X+ c_token++; X+ yzeroaxis = TRUE; X+ } X+ else if (almost_equals(c_token,"zeroa$xis")) { X+ c_token++; X+ yzeroaxis = TRUE; X+ xzeroaxis = TRUE; X+ } X+ else if (almost_equals(c_token,"noxzero$axis")) { X+ c_token++; X+ xzeroaxis = FALSE; X+ } X+ else if (almost_equals(c_token,"noyzero$axis")) { X+ c_token++; X+ yzeroaxis = FALSE; X+ } X+ else if (almost_equals(c_token,"nozero$axis")) { X+ c_token++; X+ xzeroaxis = FALSE; X+ yzeroaxis = FALSE; X+ } X+ else if (almost_equals(c_token,"par$ametric")) { X+ if (!parametric) { X+ parametric = TRUE; X+ strcpy (dummy_var, "t"); X+ (void) fprintf(stderr,"\n\tdummy variable is %s\n",dummy_var); X+ } X+ c_token++; X+ } X+ else if (almost_equals(c_token,"nopar$ametric")) { X+ if (parametric) { X+ parametric = FALSE; X+ strcpy (dummy_var, "x"); X+ (void) fprintf(stderr,"\n\tdummy variable is %s\n",dummy_var); X+ } X+ c_token++; X+ } X else if (almost_equals(c_token,"pol$ar")) { X if (!polar) { X polar = TRUE; X*************** X*** 363,371 X } X else if (almost_equals(c_token,"pol$ar")) { X if (!polar) { X! polar = TRUE; X! xmin = 0.0; X! xmax = 2*Pi; X } X c_token++; X } X X--- 441,454 ----- X } X else if (almost_equals(c_token,"pol$ar")) { X if (!polar) { X! polar = TRUE; X! if (parametric) { X! tmin = 0.0; X! tmax = 2*Pi; X! } else { X! xmin = 0.0; X! xmax = 2*Pi; X! } X } X c_token++; X } X*************** X*** 371,379 X } X else if (almost_equals(c_token,"nopo$lar")) { X if (polar) { X! polar = FALSE; X! xmin = -10.0; X! xmax = 10.0; X } X c_token++; X } X X--- 454,467 ----- X } X else if (almost_equals(c_token,"nopo$lar")) { X if (polar) { X! polar = FALSE; X! if (parametric) { X! tmin = -5.0; X! tmax = 5.0; X! } else { X! xmin = -10.0; X! xmax = 10.0; X! } X } X c_token++; X } X*************** X*** 498,503 X c_token++; X } X } X else if (almost_equals(c_token,"xr$ange")) { X BOOLEAN changed; X c_token++; X X--- 586,604 ----- X c_token++; X } X } X+ else if (almost_equals(c_token,"tr$ange")) { X+ BOOLEAN changed; X+ c_token++; X+ if (!equals(c_token,"[")) X+ int_error("expecting '['",c_token); X+ c_token++; X+ changed = load_range(&tmin,&tmax); X+ if (!equals(c_token,"]")) X+ int_error("expecting ']'",c_token); X+ c_token++; X+ if (changed) X+ autoscale_t = FALSE; X+ } X else if (almost_equals(c_token,"xr$ange")) { X BOOLEAN changed; X c_token++; X*************** X*** 533,542 X int_error( X "valid set options: '{no}arrow', {no}autoscale', '{no}clip', data', \n\ X 'dummy', 'format', 'function', '{no}grid', '{no}key', '{no}label', \n\ X! '{no}logscale','offsets', 'output', '{no}polar', 'samples', \n\ X! 'size', 'terminal', 'tics', 'title', 'xlabel', 'xrange', 'xtics', \n\ X! 'ylabel', 'yrange', 'ytics', 'zero',\n", X! c_token); X } X X /*********** Support functions for set_command ***********/ X X--- 634,643 ----- X int_error( X "valid set options: '{no}arrow', {no}autoscale', '{no}clip', data', \n\ X 'dummy', 'format', 'function', '{no}grid', '{no}key', '{no}label', \n\ X! '{no}logscale','offsets', 'output', '{no}parametric', '{no}polar', \n\ X! 'samples', 'size', 'terminal', 'tics', 'title', 'xlabel', 'xrange', \n\ X! 'xtics', '{no}xzeroaxis', 'ylabel', 'yrange', 'ytics', \n\ X! '{no}yzeroaxis','zero','zeroaxis'", c_token); X } X X /*********** Support functions for set_command ***********/ X*************** X*** 1262,1267 X show_ylabel(); X c_token++; X } X else if (almost_equals(c_token,"la$bel")) { X struct value a; X int tag = 0; X X--- 1363,1384 ----- X show_ylabel(); X c_token++; X } X+ else if (almost_equals(c_token,"xzero$axis")) { X+ (void) putc('\n',stderr); X+ show_xzeroaxis(); X+ c_token++; X+ } X+ else if (almost_equals(c_token,"yzero$axis")) { X+ (void) putc('\n',stderr); X+ show_yzeroaxis(); X+ c_token++; X+ } X+ else if (almost_equals(c_token,"zeroa$xis")) { X+ (void) putc('\n',stderr); X+ show_xzeroaxis(); X+ show_yzeroaxis(); X+ c_token++; X+ } X else if (almost_equals(c_token,"la$bel")) { X struct value a; X int tag = 0; X*************** X*** 1291,1296 X show_plot(); X c_token++; X } X else if (almost_equals(c_token,"pol$ar")) { X (void) putc('\n',stderr); X show_polar(); X X--- 1408,1418 ----- X show_plot(); X c_token++; X } X+ else if (almost_equals(c_token,"par$ametric")) { X+ (void) putc('\n',stderr); X+ show_parametric(); X+ c_token++; X+ } X else if (almost_equals(c_token,"pol$ar")) { X (void) putc('\n',stderr); X show_polar(); X*************** X*** 1324,1329 X show_term(); X c_token++; X } X else if (almost_equals(c_token,"v$ariables")) { X show_variables(); X c_token++; X X--- 1446,1456 ----- X show_term(); X c_token++; X } X+ else if (almost_equals(c_token,"tr$ange")) { X+ (void) putc('\n',stderr); X+ show_range('t',tmin,tmax); X+ c_token++; X+ } X else if (almost_equals(c_token,"v$ariables")) { X show_variables(); X c_token++; X*************** X*** 1363,1368 X show_logscale(); X show_offsets(); X show_output(); X show_polar(); X show_samples(); X show_size(); X X--- 1490,1496 ----- X show_logscale(); X show_offsets(); X show_output(); X+ show_parametric(); X show_polar(); X show_samples(); X show_size(); X*************** X*** 1368,1373 X show_size(); X show_term(); X show_tics(TRUE,TRUE); X show_range('x',xmin,xmax); X show_range('y',ymin,ymax); X show_title(); X X--- 1496,1503 ----- X show_size(); X show_term(); X show_tics(TRUE,TRUE); X+ if (parametric) X+ show_range('t',tmin,tmax); X show_range('x',xmin,xmax); X show_range('y',ymin,ymax); X show_title(); X*************** X*** 1383,1391 X int_error( X "valid show options: 'action_table', 'all', 'arrow', 'autoscale', \n\ X 'clip', 'data', 'dummy', 'format', 'function', 'grid', 'key', 'label', \n\ X! 'logscale', 'offsets', 'output', 'plot', 'polar', 'samples', \n\ X! 'size', 'terminal', 'tics', 'title', 'variables', 'version', \n\ X! 'xlabel', 'xrange', 'xtics', 'ylabel', 'yrange', 'ytics', 'zero'", c_token); X screen_ok = FALSE; X (void) putc('\n',stderr); X } X X--- 1513,1522 ----- X int_error( X "valid show options: 'action_table', 'all', 'arrow', 'autoscale', \n\ X 'clip', 'data', 'dummy', 'format', 'function', 'grid', 'key', 'label', \n\ X! 'logscale', 'offsets', 'output', 'plot', 'parametric','polar', \n\ X! 'samples', 'size', 'terminal', 'tics', 'title', 'trange', 'variables', \n\ X! 'version', 'xlabel', 'xrange', 'xtics', 'xzeroaxis', 'ylabel', \n\ X! 'yrange', 'ytics', 'yzeroaxis', 'zero','zeroaxis'", c_token); X screen_ok = FALSE; X (void) putc('\n',stderr); X } X*************** X*** 1464,1469 X } X X static void X show_label(tag) X int tag; /* 0 means show all */ X { X X--- 1595,1612 ----- X } X X static void X+ show_xzeroaxis() X+ { X+ fprintf(stderr,"\txzeroaxis is %s\n",(xzeroaxis)? "ON" : "OFF"); X+ } X+ X+ static void X+ show_yzeroaxis() X+ { X+ fprintf(stderr,"\tyzeroaxis is %s\n",(yzeroaxis)? "ON" : "OFF"); X+ } X+ X+ static void X show_label(tag) X int tag; /* 0 means show all */ X { X*************** X*** 1542,1547 X } X X static void X show_polar() X { X fprintf(stderr,"\tpolar is %s\n",(polar)? "ON" : "OFF"); X X--- 1685,1696 ----- X } X X static void X+ show_parametric() X+ { X+ fprintf(stderr,"\tparametric is %s\n",(parametric)? "ON" : "OFF"); X+ } X+ X+ static void X show_polar() X { X fprintf(stderr,"\tpolar is %s\n",(polar)? "ON" : "OFF"); X*************** X*** 1625,1630 X static void X show_autoscale() X { X fprintf(stderr,"\tx autoscaling is %s\n",(autoscale_x)? "ON" : "OFF"); X fprintf(stderr,"\ty autoscaling is %s\n",(autoscale_y)? "ON" : "OFF"); X } X X--- 1774,1781 ----- X static void X show_autoscale() X { X+ if (parametric) X+ fprintf(stderr,"\tt autoscaling is %s\n",(autoscale_t)? "ON" : "OFF"); X fprintf(stderr,"\tx autoscaling is %s\n",(autoscale_x)? "ON" : "OFF"); X fprintf(stderr,"\ty autoscaling is %s\n",(autoscale_y)? "ON" : "OFF"); X } Xdiff -cr ./setshow.h ../gnuplot2.02/setshow.h X*** ./setshow.h Tue Mar 27 08:59:12 1990 X--- ../gnuplot2.02/setshow.h Fri Nov 23 17:54:14 1990 X*************** X*** 31,36 X * global variables to hold status of 'set' options X * X */ X extern BOOLEAN autoscale_x; X extern BOOLEAN autoscale_y; X extern BOOLEAN autoscale_lx; X X--- 31,37 ----- X * global variables to hold status of 'set' options X * X */ X+ extern BOOLEAN autoscale_t; X extern BOOLEAN autoscale_x; X extern BOOLEAN autoscale_y; X extern BOOLEAN autoscale_lt; X*************** X*** 33,38 X */ X extern BOOLEAN autoscale_x; X extern BOOLEAN autoscale_y; X extern BOOLEAN autoscale_lx; X extern BOOLEAN autoscale_ly; X extern BOOLEAN clip_points; X X--- 34,40 ----- X extern BOOLEAN autoscale_t; X extern BOOLEAN autoscale_x; X extern BOOLEAN autoscale_y; X+ extern BOOLEAN autoscale_lt; X extern BOOLEAN autoscale_lx; X extern BOOLEAN autoscale_ly; X extern BOOLEAN clip_points; X*************** X*** 49,54 X extern FILE* outfile; X extern char outstr[]; X extern BOOLEAN polar; X extern int samples; X extern float xsize; /* scale factor for size */ X extern float ysize; /* scale factor for size */ X X--- 51,57 ----- X extern FILE* outfile; X extern char outstr[]; X extern BOOLEAN polar; X+ extern BOOLEAN parametric; X extern int samples; X extern float xsize; /* scale factor for size */ X extern float ysize; /* scale factor for size */ X*************** X*** 56,62 X extern char title[]; X extern char xlabel[]; X extern char ylabel[]; X! extern double xmin, xmax, ymin, ymax; X extern double loff, roff, toff, boff; X extern double zero; /* zero threshold, not 0! */ X X X--- 59,65 ----- X extern char title[]; X extern char xlabel[]; X extern char ylabel[]; X! extern double tmin, tmax, xmin, xmax, ymin, ymax; X extern double loff, roff, toff, boff; X extern double zero; /* zero threshold, not 0! */ X X*************** X*** 59,64 X extern double xmin, xmax, ymin, ymax; X extern double loff, roff, toff, boff; X extern double zero; /* zero threshold, not 0! */ X X extern BOOLEAN xtics; X extern BOOLEAN ytics; X X--- 62,70 ----- X extern double tmin, tmax, xmin, xmax, ymin, ymax; X extern double loff, roff, toff, boff; X extern double zero; /* zero threshold, not 0! */ X+ X+ extern BOOLEAN xzeroaxis; X+ extern BOOLEAN yzeroaxis; X X extern BOOLEAN xtics; X extern BOOLEAN ytics; Xdiff -cr ./standard.c ../gnuplot2.02/standard.c X*** ./standard.c Tue Sep 18 14:57:05 1990 X--- ../gnuplot2.02/standard.c Tue Dec 4 09:22:48 1990 X*************** X*** 491,498 X push( integer(&a,(int)floor((double)a.v.int_val))); X break; X case CMPLX: X! push( complex(&a,floor(a.v.cmplx_val.real), X! floor(a.v.cmplx_val.imag)) ); X } X } X X X--- 491,497 ----- X push( integer(&a,(int)floor((double)a.v.int_val))); X break; X case CMPLX: X! push( integer(&a,(int)floor(a.v.cmplx_val.real))); X } X } X X*************** X*** 507,513 X push( integer(&a,(int)ceil((double)a.v.int_val))); X break; X case CMPLX: X! push( complex(&a,ceil(a.v.cmplx_val.real), ceil(a.v.cmplx_val.imag)) ); X } X } X X X--- 506,512 ----- X push( integer(&a,(int)ceil((double)a.v.int_val))); X break; X case CMPLX: X! push( integer(&a,(int)ceil(a.v.cmplx_val.real))); X } X } X X*************** X*** 519,525 X register double y; X struct value a; X X! y = gamma(real(pop(&a))); X if (y > 88.0) { X undefined = TRUE; X push( integer(&a,0) ); X X--- 518,524 ----- X register double y; X struct value a; X X! y = GAMMA(real(pop(&a))); X if (y > 88.0) { X undefined = TRUE; X push( integer(&a,0) ); XCommon subdirectories: ./term and ../gnuplot2.02/term Xdiff -cr ./demo/using.demo ../gnuplot2.02/demo/using.demo X*** ./demo/using.demo Thu Nov 29 11:08:09 1990 X--- ../gnuplot2.02/demo/using.demo Mon Nov 26 23:04:29 1990 X*************** X*** 0 X X--- 1,23 ----- X+ # X+ # Requires data file "using.dat" from this directory, X+ # so change current working directory to this directory before running. X+ # X+ set samples 168 X+ set title "Convex November 1-7 1989" X+ set label "(Weekend)" at 5,25 center X+ plot 'using.dat' using "%*s %*s %f %f" title "Logged in" with impulses,\ X+ 'using.dat' using "%*s %*s %f %*f %f" t "Load average" with points,\ X+ 'using.dat' using "%*s %*s %f %*f %*f %f" t "%CPU used" with lines X+ set nolabel X+ pause -1 "Hit return to continue" X+ X+ set title "Convex November 1-7 1989 Circadian" X+ set xrange[-1:24] X+ plot 'using.dat' using "%*s %f %*f %f" title "Logged in" with impulses,\ X+ 'using.dat' using "%*s %f %*f %f" title "Logged in" with points X+ pause -1 "Hit return to continue" X+ X+ # undo what we have done above X+ set title X+ set samples 160 X+ set xrange [-10:10] Xdiff -cr ./docs/doc2ms.c ../gnuplot2.02/docs/doc2ms.c X*** ./docs/doc2ms.c Tue Mar 27 08:59:39 1990 X--- ../gnuplot2.02/docs/doc2ms.c Thu Nov 29 10:02:07 1990 X*************** X*** 124,130 X break; X } X default: { X! putms(line+1,b); X break; X } X break; X X--- 124,133 ----- X break; X } X default: { X! if (line[0] == '\n') X! putms(line,b); /* handle totally blank line */ X! else X! putms(line+1,b); X break; X } X break; Xdiff -cr ./docs/doc2tex.c ../gnuplot2.02/docs/doc2tex.c X*** ./docs/doc2tex.c Thu Aug 30 16:14:59 1990 X--- ../gnuplot2.02/docs/doc2tex.c Thu Nov 29 10:02:09 1990 X*************** X*** 107,113 X (void) fputs("\\end{verbatim}\n",b); X verb=FALSE; X } X! puttex(line+1,b); X } X break; X } X X--- 107,116 ----- X (void) fputs("\\end{verbatim}\n",b); X verb=FALSE; X } X! if (line[0] == '\n') X! puttex(line,b); /* handle totally blank line */ X! else X! puttex(line+1,b); X } X break; X } Xdiff -cr ./docs/gnuplot.1 ../gnuplot2.02/docs/gnuplot.1 X*** ./docs/gnuplot.1 Tue Sep 18 14:57:57 1990 X--- ../gnuplot2.02/docs/gnuplot.1 Mon Dec 10 10:38:09 1990 X*************** X*** 47,53 X HP2648, X HP75xx, X HPGL, X! IBM Proprinter, X Imagen, X Iris 4D, X Kermit-MS, X X--- 47,53 ----- X HP2648, X HP75xx, X HPGL, X! HP LaserJet II, X Imagen, X Iris 4D, X Kermit-MS, X*************** X*** 51,56 X Imagen, X Iris 4D, X Kermit-MS, X LaTeX, X NEC CP6 pinwriter, X PostScript, X X--- 51,57 ----- X Imagen, X Iris 4D, X Kermit-MS, X+ Kyocera laser printer, X LaTeX, X NEC CP6 pinwriter, X PostScript, X*************** X*** 56,61 X PostScript, X QMS QUIC, X ReGis (VT125 and VT2xx), X Selanar, X Star color printer, X Tandy DMP-130 printer, X X--- 57,63 ----- X PostScript, X QMS QUIC, X ReGis (VT125 and VT2xx), X+ SCO Xenix CGI, X Selanar, X Star color printer, X Tandy DMP-130 printer, X*************** X*** 62,68 X Tek 401x, X Tek 410x, X Vectrix 384, X! Unix PC (ATT 3b1 or ATT 7300) X unixplot, X and X11. X The PC version compiled by Microsoft C X X--- 64,71 ----- X Tek 401x, X Tek 410x, X Vectrix 384, X! VT like tekronix emulator, X! Unix PC (ATT 3b1 or ATT 7300), X unixplot, X and X11. X The PC version compiled by Microsoft C Xdiff -cr ./term/unixpc.trm ../gnuplot2.02/term/unixpc.trm X*** ./term/unixpc.trm Tue Sep 18 14:59:18 1990 X--- ../gnuplot2.02/term/unixpc.trm Wed Dec 12 11:00:30 1990 X*************** X*** 81,88 X #define uPC_XLAST (uPC_XMAX - 1) X #define uPC_YLAST (uPC_YMAX - 1) X X! #define uPC_VCHAR 11 X! #define uPC_HCHAR 7 X #define uPC_VTIC 8 X #define uPC_HTIC 12 X X X--- 81,88 ----- X #define uPC_XLAST (uPC_XMAX - 1) X #define uPC_YLAST (uPC_YMAX - 1) X X! #define uPC_VCHAR FNT5X9_VCHAR X! #define uPC_HCHAR FNT5X9_HCHAR X #define uPC_VTIC 8 X #define uPC_HTIC 12 X X*************** X*** 467,474 X unsigned int x, y; X int c, angle; X /* X! Put a character at an x,y location in the bit map (using the font5x7 X! array. This is mostly just copied from the epson driver. X */ X { X int i, j, k; X X--- 467,474 ----- X unsigned int x, y; X int c, angle; X /* X! Put a character at an x,y location in the bit map (using the fnt5x9 X! array. This is mostly just copied from the bitmap.c driver. X */ X { X int i, j, k; X*************** X*** 473,479 X { X int i, j, k; X register Scr_type mask, *a; X! char fc; X unsigned int pixelon; X X i = c - ' '; X X--- 473,479 ----- X { X int i, j, k; X register Scr_type mask, *a; X! char_row fc; X unsigned int pixelon; X X i = c - ' '; X*************** X*** 477,485 X unsigned int pixelon; X X i = c - ' '; X! for(j=0; j < 9; j++) { X! fc = font5x7[i][j]; X! for (k=0; k < 5; k++) { X pixelon = ((unsigned int)(fc))>>k & 1; X if (pixelon) { X switch (angle) { X X--- 477,485 ----- X unsigned int pixelon; X X i = c - ' '; X! for (j=0; j<FNT5X9_VBITS; j++) { X! fc = fnt5x9[i][j]; X! for (k=0; k<FNT5X9_HBITS; k++) { X pixelon = ((unsigned int)(fc))>>k & 1; X if (pixelon) { X switch (angle) { END_OF_patch2d if test 47123 -ne `wc -c <patch2d`; then echo shar: \"patch2d\" unpacked with wrong size! fi # end of overwriting check fi echo shar: End of shell archive. exit 0 exit 0 # Just in case... -- Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM Sterling Software, IMD UUCP: uunet!sparky!kent Phone: (402) 291-8300 FAX: (402) 291-4362 Please send comp.sources.misc-related mail to kent@uunet.uu.net.